Cosmetic changes.

2007-07-24  Tor Lillqvist  <tml@novell.com>

	* gdk/win32/gdkkeys-win32.c (update_keymap): Cosmetic changes.

svn path=/trunk/; revision=18538

diff --git a/ChangeLog b/ChangeLog
index 7b6ba7fb405bb4f76bfdd582f69759e3a620d92f..6f1222b60cf4c3ae4a3e0f081679d21e70e3a1cb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-07-24  Tor Lillqvist  <tml@novell.com>
+
+       * gdk/win32/gdkkeys-win32.c (update_keymap): Cosmetic changes.
+
 2007-07-24  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkmenubar.c (window_key_press_handler):

diff --git a/gdk/win32/gdkkeys-win32.c b/gdk/win32/gdkkeys-win32.c
index f2bdae970ec3431834baa540752422f73762d4be..65310cc90124ac449e13a946def5ec79d1a939b2 100644 (file)
--- a/gdk/win32/gdkkeys-win32.c
+++ b/gdk/win32/gdkkeys-win32.c
@@ -384,22 +384,17 @@ update_keymap (void)
                  wchar_t wcs[10];
                  gint k;
 
+                 wcs[0] = wcs[1] = 0;
                  k = ToUnicodeEx (vk, scancode, key_state,
                                   wcs, G_N_ELEMENTS (wcs),
                                   0, _gdk_input_locale);
 #if 0
-                 g_print ("ToUnicodeEx(%02x, %d: %d): %d, %04x %04x\n",
+                 g_print ("ToUnicodeEx(%#02x, %d: %d): %d, %04x %04x\n",
                           vk, scancode, shift, k,
-                          (k != 0 ? wcs[0] : 0),
-                          (k >= 2 ? wcs[1] : 0));
+                          wcs[0], wcs[1]);
 #endif
                  if (k == 1)
                    *ksymp = gdk_unicode_to_keyval (wcs[0]);
-
-                 if (k == 1)
-                   {
-                     /* Keysym already stored above */
-                   }
                  else if (k == -1)
                    {
                      guint keysym = gdk_unicode_to_keyval (wcs[0]);